From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Tue, 20 Nov 2012 18:53:22 +0000 (+0100)
Subject: MessageTray: fix popping up after there were modals
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5395
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3b70094151f634d80fb949cbc089fb62c072f5ee;p=gnome-shell.git

MessageTray: fix popping up after there were modals

Open a modal dialog, try to open the message tray -> no effect, the message
tray is blocked by the dialog.
Close the dialog, try to open the message tray by pointer -> still
no effect, because the old timeout id was not cleared the first time,
so the dwell callback thinks the tray is about to open.

https://bugzilla.gnome.org/show_bug.cgi?id=688750
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 483b71dc4..31283e690 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1606,6 +1606,8 @@ const MessageTray = new Lang.Class({
     },
 
     _trayDwellTimeout: function() {
+        this._trayDwellTimeoutId = 0;
+
         if (Main.modalCount > 0)
             return false;
 
@@ -1616,8 +1618,6 @@ const MessageTray = new Lang.Class({
         if (currentUserTime != this._trayDwellUserTime)
             return false;
 
-        this._trayDwellTimeoutId = 0;
-
         this._traySummoned = true;
         this._updateState();